finally fix bug with comments