Fixed glitch in a better way