tweak path handling