Fixing https://wso2.org/jira/browse/IDENTITY-2959