Always resolve to its own directory; fix