Fix build failure after merge