Loop break fix