1.4 HotFix for the HotFix