Fixed the flickering