Fixed encoding bug
Bugfixes