New attempt to fix paths