#644 Fix a registration issue