Fix for DAWNSCI-876