Fixed double wrapping of bridge file. Updated version