Fix a 1.8.7 incompatibility.