Fixed bug and a old comment