fix snapshotting
fix snapshotting more