Potential fix for mystery flickering bug