Scope bugfix for VOL-71.