Fixed bug introducted in transport layer during refactor