Refactored what is pickled, looks like it works around linux bug?