to fix the issue with comments