removed double accessing of dictionary
Merge branch 'master' into UI-remake