Trying again to fix paths.