MISSION CRITICAL BUG FIX