Fix issue with iterating over user dict