Fixing issue commenting