fixed snapshot after refactoring