move eval-step inside to take effect one step earlier