Fix registration problem