Make experiment continuation more robust