Reloading bugs fixed