#714 Fixed duplicates