HotFix for 24/12