More 1.6 compat