re fix tab mapping