Changed the fix to preserve the behavior of a regular dict