Transport mode selection now works properly