remove dictionary comprehension to keep py2.6 support