--- a/CheckBox.st	Sat Apr 02 17:09:33 2016 +0200
+++ b/CheckBox.st	Sat Apr 02 17:09:54 2016 +0200
@@ -562,7 +562,7 @@
     xlatedLabel := self defineShortcutAndTranslateLabelStringFrom:aStringOrImageOrForm.
     self isNativeWidget ifTrue:[
         gc drawableId notNil ifTrue:[
-            self graphicsDevice changeLabel:xlatedLabel in:gc drawableId
+            device changeLabel:xlatedLabel in:gc drawableId
         ]
     ].
     labelView label:xlatedLabel.
@@ -767,7 +767,7 @@
     |graphicsDevice|
 
     super initStyle.
-    graphicsDevice := self graphicsDevice.
+    graphicsDevice := device.
 
     DefaultLabelForegroundColor notNil ifTrue:[
         labelForegroundColor := DefaultLabelForegroundColor onDevice:graphicsDevice.