Makes sure unpickling works for #31