Fixed glitches resulting from previous commit :|