Fixed heuristic glitch