tried to fix some reloading issue