fix for ESBJAVA-3260
Merge pull request #98 from isudana/master

fix for ESBJAVA-3260