Fix. dictionary is overkill