bug fixed for eval