first part of load/save fix