bug fixes for eval