Fixed scoping issue elsewhere