adapt to new fetch syntax branch