Finish Loop -bugs