fixed fetching bug