rough almost-working eval-style fix for issue 82