fixes ZEN-9726
fixes ZEN-9726
Merge pull request #2 from dbouchillon/feature/ZEN-9726

fixes ZEN-9726