extra fix for encoding