[#54] Small code improvement to prevent duplicated paths