fix bridge implementation