Fix
Fix history heuristic