NJ: event fix