Fix Pickling Bug