Bugfix for multi-byte characters in comments