Fixed a bug (introduced in commit 64db6bc3...) and another one in Factors2mx