fix wrong paths after r18955.