Bugfix on recently introduced factory feature.