adjust fetches

Change-Id: Ic893cfb097cc2db59faecd10c6afe56b5ba5faa2