fixed reloading behaviour