fix compile error after merge