Further repaired that glitch