fix compilation after rebase