Fix registration after merge