FIX - encoding stuff for comments