Fix build error in 2.6