Fix itervalues not being called