Update for when 2.6 - 3.x compat