adjust fetching

Change-Id: I48a31e6b61de3ed3f8362e38437619e0155199ac