fix not storing events when class is not available