#323 Improved encoding situation a bit.