Fix revert to path.join