one more precaution in the save handling