Compensate indigo 1.1.11-2 glitches