Another attempt to fix paths.