handled map entries not being objects sometimes