Fix tab handler