Fixed for latest ABXD3