fix shape after un-deformation, verify after both conversions