Fix bug with handler registrar