Atomic/fix reprepare

Making sure that one can reprepare and atomic dataset (important for dalek) - merge if passing @orbitfold