Recent Commits to calculator

Resolve an existing defect when restoring from snapshots (#2249)

* fix bug

* fix a comment