fix load and save