Tabs finally fixed in patch