workaround for Eval-Closure and 5.21.7