Attempt to fix eval