Better py2.6 workaround