removed dict comprehension to better work on python 2.6