Fix some cases where duplicates could appear