Fixed: Missed break in while