bug fix for emergency