Emergency bug

Fixing the Emergency won't stop bug #448