Fixed broken 2.7 compat