1.2 hotfix