Make compatible with pandexio