Save point before APDU rework