3-5-2 hotfix