Removed hack to fix encoding (that didn't work)