Class fix for tabbing