While fix