diff --git a/src/case/button/switch.js b/src/case/button/switch.js
index 2cfbf8839..1ca2bd2b6 100644
--- a/src/case/button/switch.js
+++ b/src/case/button/switch.js
@@ -77,7 +77,7 @@ BI.Switch = BI.inherit(BI.BasicButton, {
 
     doClick: function () {
         BI.Switch.superclass.doClick.apply(this, arguments);
-        this.fireEvent(BI.Switch.EVENT_CHANGE);
+        this.fireEvent(BI.Switch.EVENT_CHANGE, this.isSelected());
     }
 });
 BI.Switch.EVENT_CHANGE = "EVENT_CHANGE";
diff --git a/typescript/base/single/label/abstract.label.ts b/typescript/base/single/label/abstract.label.ts
index 431d79ab6..60d6ee8fc 100644
--- a/typescript/base/single/label/abstract.label.ts
+++ b/typescript/base/single/label/abstract.label.ts
@@ -10,7 +10,7 @@ export declare class AbstractLabel extends Single {
         textHeight?: number | null;
         highLight?: boolean;
         handler?: Function | null;
-        text?: string;
+        text?: string | ((context: any) => string);
     } & Single['props']
 
     doRedMark(...args: any[]): void;