Fix for https://jira.duraspace.org/browse/ISLANDORA-868