fix compilation error resulting from rebase