More work on tab fix