Incorporates path bugfix [another].

Previous commits didn't really fix the bug.