fix for GDS-1255
Merge pull request #14 from GFriedrich/GDS-1255

GDS-1255 Fix from gfriedrich