Fixing conversion to canonical for bonds.