modifies fix for release 3.1.0 issue #8 (cf https://wiki.duraspace.org/display/DSPINT/Release+3.1.0+Tasks)