Adding workaround for NormalizedDict