am: 171079af05 * commit '171079af05295f069b29325c5f344bf768692f81': Fix positioning in path fallback case