Committing the fix for issue https://wso2.org/jira/browse/CEP-867