Fix uniqueness constraint on stops