Fixed Eclipse-glitches