Yet ANOTHER attempt to fix paths