Fix registration
Merge