1.8 compat

@jawspeak PTAL