Fixing https://wso2.org/jira/browse/WSAS-1762