applied 1.16 hotfix