HotFixes for define