fix for ESBJAVA-3397
Merge pull request #173 from isudana/master

fix for ESBJAVA-3397