fixing 2.6 compat