Tabcom another fix/improvement