Fix Issue #1, much better path (pun)