removed double accessing of dictionary