Fix duplicate bridges being generated