Fix a 1.8 incompatibility