fix tab issues, again