Fixing bridge creation to catch all bridges