Fix evaluation issue