Fix dupe functions