Change right before removing loop