Fix ESBJAVA-3208 - Fix done by Maninda
Merge pull request #48 from malakasilva/master

Fix ESBJAVA-3208