GEOT-4587 fix
Merge pull request #287 from dromagnoli/GEOT-4587

GEOT-4587 fix