Another attempt to fix file paths