Updated to while

Check changelog for more info