commiting patch for https://wso2.org/jira/browse/CEP-850 by Mohan