Handled wrong behaviour on repo change