Fixed while looping