fix for GDS-1257
Merge pull request #15 from GFriedrich/GDS-1257

GDS-1257 fix