Another fix for save callbacks