Encoding change didn't work, reverting to workaround