fix issue with comments