really fix SNAPSHOT stuff now