re-re-fix on Factory