#3405 - fix race between consumer and producer for MPSC