Potential NEI crash fix