SNAPSHOT fix