Fix for https://wso2.org/jira/browse/ESBJAVA-3267
Merge pull request #103 from sandamal/ESBJAVA-3267

Fix for https://wso2.org/jira/browse/ESBJAVA-3267