Removed encoding bug