Fixed issue with includeNonPlottableEvents