fixed up encoding only