Flickering issue fix