Flickering fix