In Dev 12 hotfix