Fixed file fetching