Fix block evaluation context