fixed buggy fetching