#5 regression scope refactor. One more fix.