correction to eval-when setup