Proper fix for ESBJAVA-3158
Merge pull request #126 from malakasilva/master

Proper fix for ESBJAVA-3158