fix some reloading bugs