Fix duplicate validation