Proper fix for native transport