Implemented fix using PushProducer #8