Fixing ESBJAVA-3280
Merge pull request #114 from iuj/master

Fixing ESBJAVA-3280