Made the fix more fancy.