- Resolved issue with for loop break in wrong spot