Fix wrong extra being removed