Fixed handling of eval; need better solution for this.