Path resolution bugfix