Added a roll-over heuristic.