This should fix this stuff
Finish Hotfix-1.2.4