Added necessary eval-when to avoid compile errors