diff --git a/TelegramBaseTest/Tests/Controls/ButtonGridForm.cs b/TelegramBaseTest/Tests/Controls/ButtonGridForm.cs
index 86cb07c..0b47b2c 100644
--- a/TelegramBaseTest/Tests/Controls/ButtonGridForm.cs
+++ b/TelegramBaseTest/Tests/Controls/ButtonGridForm.cs
@@ -24,7 +24,7 @@ namespace TelegramBaseTest.Tests.Controls
         {
             m_Buttons = new ButtonGrid();
 
-            await m_Buttons.SetKeyboardType(TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard);
+            m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard;
 
             ButtonForm bf = new ButtonForm();
 
@@ -58,10 +58,10 @@ namespace TelegramBaseTest.Tests.Controls
                 switch (m_Buttons.KeyboardType)
                 {
                     case TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard:
-                        await m_Buttons.SetKeyboardType(TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard);
+                        m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard;
                         break;
                     case TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard:
-                        await m_Buttons.SetKeyboardType(TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard);
+                        m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard;
                         break;
                 }
 
diff --git a/TelegramBotBase/Controls/ButtonGrid.cs b/TelegramBotBase/Controls/ButtonGrid.cs
index 898a4da..76cdfdc 100644
--- a/TelegramBotBase/Controls/ButtonGrid.cs
+++ b/TelegramBotBase/Controls/ButtonGrid.cs
@@ -32,21 +32,26 @@ namespace TelegramBotBase.Controls
         /// </summary>
         public eKeyboardType KeyboardType
         {
-            get; private set;
+            get
+            {
+
+                return m_eKeyboardType;
+            }
+            set
+            {
+                if(m_eKeyboardType != value)
+                {
+                    this.RenderNecessary = true;
+
+                    Cleanup().Wait();
+
+                    m_eKeyboardType = value;
+                }
+                
+            }
         }
 
-        public async Task SetKeyboardType(eKeyboardType type)
-        {
-            if (KeyboardType == type)
-                return;
-
-            this.RenderNecessary = true;
-
-            Cleanup().Wait();
-
-            KeyboardType = type;
-
-        }
+        private eKeyboardType m_eKeyboardType = eKeyboardType.ReplyKeyboard;
 
         private bool m_bVisible = true;