Fixed issue with bad scope parameterization
Fixing another scope parameterization issue