added checking for eval