CDB-1305 Another bugfix (rushing without tests is BAD)