Proper 1.8 support