fixing https://wso2.org/jira/browse/STORE-50