Fixed un-pairing