Registeration return type fix