Implemented possible NEI fix