Better snapshotting on timeouts