fix: scope evaluation errors