fixed bug and comment