2.7 compat continued