EMERGENCY FIXES