fix heuristic to match comments