Another try to fix pending data stall