Adressing dicts -> sets; forgot to mention that this PR fixes #483