[3.8] Fix #1703 bridge is broken