working on long fetching bug fix