path fix and improvement