Fix build error caused by last merge