Should fix deregister