A second attempt to get the tabs right :(