Bugfix for dictionary