Fix for DAWNSCI-982