better snapshot fix