Fixed evalutation bug