fix eval for new input handling