Fix ESBJAVA-3320
Merge pull request #135 from malakasilva/master

Fix ESBJAVA-3320