Fix eval, surely there is a better way to do this?>

Fix eval, surely there is a better way to do this?> #1560