Fixed pickle support.