[bugfix] using dictionary