avoiding potential data leaks from snapshot 107