Corrected handler.