Fix ESBJAVA-3431
Merge pull request #160 from malakasilva/master

Fix ESBJAVA-3431