fixed evaluation of code