Along with previous commit and Dashel changes, fixes issue #220