Fixed issue with non-extended factory