fixed fetching
fixed fetching