fixed load/save issues