Fixed Basename Issue in FetchFiles method