3 to 2 migration manual fix encoding