Remove this until heuristic improves