Changed encoding handling