fix rebase regression on L226