#42 encoding fix