1.2 hotfix part 2