Fixed Bug: add missing :execute to eval-when.