remove dict comprehension for 2.6 compatibility