Heuristics seem to work now.