Address ISLANDORA-977.

Ah! If that is the case, I'll just close these two tickets then.