Reachability bug fix