Issue #667 small fix for evaluation