fixed encoding issues
bugfixing