added encoding fix