Corrected handler self-registration.