Resolving path collision, fixes #19