* Fix Re-registration