Fix for https://wso2.org/jira/browse/MB-850