Fixed variable evaluation issue