Scope bugfix for VOL-71.
Merge pull request #206 from GinkgoFJG/master-VOL-71

Scope bugfix for VOL-71.