fix load/save support