Fixed issue of reloading