fixed evaulation code