Fixed some bugs in the reloading