fix for ERRAI-696
Merge pull request #83 from edewit/ERRAI-696

fix for ERRAI-696