Ds 1510

Fix for https://jira.duraspace.org/browse/DS-1510