fixed NEI/TMI compatibility, hopefully