Fixed SCI-1006, I believe this papers over a problem reported in
DAWNSCI-571