Fix poor handling of tab hash locations