Fix loading flicker