Final fix

Fix with proper MCE code: shorter and better.