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