fix endless fetch