Fix for clientIds being overwritten in the bridge