Duplication fix turned on by default