Fixed glitches in Controller