Possible fix from Jason for snapshot problems on startup

Change-Id: I477765ba7ef80dd8e1e1aeacc8610097cb588a5a