Issue #289: Updates SPReachability logic