Quick fix encoding bug