Fixes duplicate and validation fail