Interoperability fix