fixed slow save / load