Hotfix/23 impl fixed factory