Empty paths are now handled correctly