Adjusted distance calculation in critical situations