Merge pull request #617 from buda-base/JENA-1749-fix

fix JENA-1749