Fix for flickering