Fixing backpressure issue