fixed fetching issues.