Bug fix for emergency