More tab fixing