Fix nasty error on reload