Changed the &path generation.