Fix for bridge mappings