lib/dry/validation/message_set.rb in dry-validation-1.5.0 vs lib/dry/validation/message_set.rb in dry-validation-1.5.1

@@ -83,10 +83,10 @@
       end
 
       # @api private
       def freeze
         source_messages.select { |err| err.respond_to?(:evaluate) }.each do |err|
-          idx = source_messages.index(err)
+          idx = messages.index(err) || source_messages.index(err)
           msg = err.evaluate(locale: locale, full: options[:full])
           messages[idx] = msg
         end
         to_h
         self