diff --git a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift
index ae46f80b..e1dc6d18 100644
--- a/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift
+++ b/VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift
@@ -101,7 +101,8 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega
     override public var disabled: Bool {
         didSet {
             buttons.forEach { button in
-                button.disabled = disabled
+                var b = button
+                b.disabled = disabled
             }
         }
     }
@@ -109,7 +110,8 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega
     override public var surface: Surface {
         didSet {
             buttons.forEach { button in
-                button.surface = surface
+                var b = button
+                b.surface = surface
             }
         }
     }