fixed the glitch #21