Fix ENLIGHTENED problem
Sync with upstream