Fix bug & while()