Fix up registratin issue