Fix broken reachibility checks