Fix snapshots saving