fixed bug with comments