fixes so bridging works