Fix build in 1.8.7