Fix duplicated entries. Fixes #17