Hotfix 1.2.1