Fix eval for new style