Dst bugs

Fixes issue #16