* Fix Re-registration
