Hotfix for target creation