Bugfix Keep duplicates