[fix] properly enqueue and discharge data