Fix build on 1.8.7