diff --git a/source/bot.py b/source/bot.py
index ed58981..540fa6a 100644
--- a/source/bot.py
+++ b/source/bot.py
@@ -598,10 +598,23 @@ def get_user_guess(message, start_time):
     user_id = int(message.from_user.id)
 
 
-    try:
-        user_guess = float(message.text)
-    except ValueError:
-        bot.send_message(chat_id=user_id, text="Please type a number (or float with '.' )")
+    if message.text.count(",") == 0:
+        try:
+            user_guess = float(message.text)
+        except ValueError:
+            bot.send_message(chat_id=user_id, text="Please type a number (or float with '.' )")
+            bot.register_next_step_handler(message, get_user_guess, start_time)
+            return
+
+    if message.text.count(",") == 1:
+        try:
+            user_guess = float(message.text.replace(",", "."))
+        except ValueError:
+            bot.send_message(chat_id=user_id, text="Please type a number of float")
+            bot.register_next_step_handler(message, get_user_guess, start_time)
+            return
+    else:
+        bot.send_message(chat_id=user_id, text="Please type a number or float")
         bot.register_next_step_handler(message, get_user_guess, start_time)
         return
 
diff --git a/source/daily_challenge.py b/source/daily_challenge.py
index e99af9c..7a64615 100644
--- a/source/daily_challenge.py
+++ b/source/daily_challenge.py
@@ -161,7 +161,6 @@ def find_todays_product_from_db():
     return product
 
 if __name__ == "__main__":
-    set_todays_product()
     try:
         start_challenges()
         sys.exit(-1)