Make it work with 1.8.7