Fix for #516
Merge pull request #536 from aodn/issue-516

Fix for #516