Temporary flicker workaround