Fix BridgeSupport generation