fixed up path handling