fix compile after merge with 2.3.x