Hotfix for Factory