Fix Build Error after merge