Fixing https://wso2.org/jira/browse/PAAS-124