#696 - update eval code