diff --git a/models/AppState.py b/models/AppState.py
index 52c4da8c..04cc9329 100644
--- a/models/AppState.py
+++ b/models/AppState.py
@@ -216,11 +216,19 @@ def minimum_order_quote(self, quote: float = 0.0, balancechk: bool = False):
                 raise Exception(f"Market not found! ({self.app.market})")
 
         elif self.app.exchange == Exchange.COINBASE:
+            product = self.api.auth_api("GET", f"api/v3/brokerage/products/{self.app.market}")
+            if len(product) == 0:
+                sys.tracebacklimit = 0
+                raise Exception(f"Market not found! ({self.app.market})")
+            
             ticker = self.api.get_ticker(self.app.market, None)
             price = float(ticker[1])
-
             quote = float(quote)
-            base_min = self.api.market_quote_increment(self.app.market, quote)
+            
+            try:
+                base_min = float(product[["base_min_size"]].values[0])
+            except Exception:
+                base_min = 0.0
 
         elif self.app.exchange == Exchange.COINBASEPRO:
             product = self.api.auth_api("GET", f"products/{self.app.market}")
diff --git a/telegram_bot.py b/telegram_bot.py
index 8273d514..52edb875 100644
--- a/telegram_bot.py
+++ b/telegram_bot.py
@@ -51,7 +51,7 @@
 EXCHANGE, MARKET, ANYOVERRIDES, OVERRIDES, SAVE, START = range(6)
 EXCEPT_EXCHANGE, EXCEPT_MARKET = range(2)
 
-replykeyboard = [["Coinbase Pro", "Binance", "Kucoin"]]
+replykeyboard = [["Coinbase", "Coinbase Pro", "Binance", "Kucoin"]]
 
 markup = ReplyKeyboardMarkup(replykeyboard, one_time_keyboard=True)