Make stair usage more fault tolerant in close quarters