Fixed pickle bug