Add fix for flickering