Fix for native bridge