Hot fix at registration