Try to avoid flickering on reload