wip bridge fix