Link to issue on flickering fix