Fix file import, part 2