Fixed bug and comment