Better handling no data for bonds.