Fixed dictionary/value bug