#419, #420: path fix