Fix registration