Flickering issue fixed