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

$Subject. But haven't done smoke test..