fixed snapshoting in some scenarios