Fix binary incompatibility