Fix flickering during load