fix ExpandPath