Improvement for an --eval mechanism