fix first-load glitch