Fixed issue with comments