MakePath special cases fixes #24