Really fix the 1.8 incompatibility