Bugfix confused delete/deregister