fix for ESBJAVA-3133
Merge pull request #35 from Susankha/master

fix for ESBJAVA-3133