Fixing the bug introduced when we enabled tansport feature