Fix file related issue