Fix failure in 1.8.7