Fixes Issue #285.
Merge branch 'garth/fix-issue-285' into next