fixes #46
being extra careful with duplications