bug fix on reload