added dvash per issue #409