Fixing comment processing