Including Tcomms Waste fix