Fix build error after merge..