fix pending transaction handling upstream