v3: fix up dictionary after last PR