Fix to DAWNSCI-755