Fix scope evaluation