further path fixing