Fix issue with reloading