Fix #492 save_point utils