more pickling to speed up the SFR part
small bug in pickler