Tcomms fix