[Sprint 46] fix emergencies