Merge "more normalized path fix"