fix bug
Merge pull request #116 from alberts-tid/bug/CLAUDIA-4331

Bug/claudia 4331