Bug fix on reload.