diff --git a/src/lib/installation/clients/inst_casp_overview.rb b/src/lib/installation/clients/inst_casp_overview.rb
index 9b1e3a8a0..1ad09488d 100644
--- a/src/lib/installation/clients/inst_casp_overview.rb
+++ b/src/lib/installation/clients/inst_casp_overview.rb
@@ -79,7 +79,7 @@ def run
           # %s is a heading of a problematic section, like "Partitioning" or "Network"
           Yast::Popup.Error(
             _("%s blocks the installation. Please solve the problem there before proceeding.") %
-            blocker.label.gsub(/&/, "")
+            blocker.label.delete("&")
           )
           next
         end
diff --git a/src/lib/installation/widgets/overview.rb b/src/lib/installation/widgets/overview.rb
index cae9f83e4..859ad2061 100644
--- a/src/lib/installation/widgets/overview.rb
+++ b/src/lib/installation/widgets/overview.rb
@@ -64,14 +64,14 @@ def items
           ])
         if d["warning"] && !d["warning"].empty? && d["warning_level"] != :notice
           Yast::Popup.LongError(
-            "Problem found when proposing %{client}:<br>" \
-            "Severity: %{severity}<br>" \
-            "Message: %{message}" %
-            ({
-              client: label,
+            format(
+              "Problem found when proposing %{client}:<br>" \
+              "Severity: %{severity}<br>" \
+              "Message: %{message}",
+              client:   label.delete("&"),
               severity: (d["warning_level"] || :warning).to_s,
-              message: d["warning"]
-            })
+              message:  d["warning"]
+            )
           )
           @blocking = [:blocker, :fatal].include?(d["warning_level"])
         end