bug fixed for ZK-2076 that doesn't consider the case for the extended event class.