fix for ESBJAVA-3107
Merge pull request #89 from isudana/master

fix for ESBJAVA-3107