Make this more 1.8 friendly