Fixing dictionary per-section lookup.  Resolves #421