Fix for non-root paths