#10400 fixing narrow halls