fix compile error after rebase