3.1 hotfix