fix upload slowness and blocking