Fix to DAWNSCI-5705