Safety commit
constness in snapshot