Fix for Jira:https://wso2.org/jira/browse/REGISTRY-2310