eval bug fixed