Fixed eval-when for fresh compile