Fix for #387
Merge pull request #501 from aodn/issue-387

Fix for #387