More workaround code for https://github.com/uhop/dcl/issues/9,
fixes #59.