Scope error fix pt 2