Draft - small (provisory) encoding fix - fixes #1825