Improving checking and fixing old excursions