TFQ: Fix when recording events