fix ESBJAVA-3058
Merge pull request #15 from malakasilva/master

fix ESBJAVA-3058