needs more re for encoding fix