Hotfix/no promotion

Not thoroughly tested...