NEI Support Fix