Fix ISLANDORA-990
Merge pull request #174 from ruebot/7.x-ISLANDORA-990

Fix ISLANDORA-990