Trying to fix the NEI again