Fix problem with registrations