Refix reselection bug