changes for pandexio compatability