Fix issue with deregister