Bugfix - Repair duplication