Fixing deformation issues