Fixing tabs, again