+++ fixed path bugs