Bug fix WHILE.