Fixed DAWNSCI-544 (broken from fix for DAWNSCI-541)