Fix 5871c07 in case of short-tracking.