GEOT-4367
Merge pull request #108 from simboss/GEOT-4367

Fix for GEOT-4367