Fixed encoding weirdness for real