fixed some delivery bugs with fetch mode