Fixed bug where snapshot would be taken too early