fixed up 2.7 compat