removed dict comprehension to be 2.6 safe