diff --git a/src/bme_utils.cpp b/src/bme_utils.cpp
index 05bc34e..911df49 100644
--- a/src/bme_utils.cpp
+++ b/src/bme_utils.cpp
@@ -16,11 +16,11 @@ float newHum, newTemp, newPress, newGas;
 
 
 Adafruit_BME280     bme280;
-Adafruit_BME680     bme680;
 #ifdef HELTEC_V3
 Adafruit_BMP280     bmp280(&Wire1);
 #else
 Adafruit_BMP280     bmp280;
+Adafruit_BME680     bme680;
 #endif
 
 
@@ -57,25 +57,19 @@ namespace BME_Utils {
                         wxModuleType = 1;
                         wxModuleFound = true;
                     }
-                    /*if (!wxModuleFound) {
-                        if (bme680.begin(wxModuleAddress, &Wire1)) {
-                            Serial.println("BME680 sensor found");
-                            wxModuleType = 3;
-                            wxModuleFound = true;
-                        }
-                    }*/
                 #else
                     if (bme280.begin(wxModuleAddress)) {
                         Serial.println("BME280 sensor found");
                         wxModuleType = 1;
                         wxModuleFound = true;
                     }
-                    /*if (!wxModuleFound) {
-                    if (bme680.begin(wxModuleAddress)) {
-                        Serial.println("BME680 sensor found");
-                        wxModuleType = 3;
-                        wxModuleFound = true;
-                    }*/
+                    if (!wxModuleFound) {
+                        if (bme680.begin(wxModuleAddress)) {
+                            Serial.println("BME680 sensor found");
+                            wxModuleType = 3;
+                            wxModuleFound = true;
+                        }
+                    }
                 #endif
                 if (!wxModuleFound) {
                     if (bmp280.begin(wxModuleAddress)) {
@@ -106,13 +100,15 @@ namespace BME_Utils {
                                         ); 
                             Serial.println("BMP280 Module init done!");
                             break;
-                        /*case 3:
-                            bme680.setTemperatureOversampling(BME680_OS_1X);
-                            bme680.setHumidityOversampling(BME680_OS_1X);
-                            bme680.setPressureOversampling(BME680_OS_1X);
-                            bme680.setIIRFilterSize(BME680_FILTER_SIZE_0);
-                            Serial.println("BMP680 Module init done!");
-                            break;*/
+                        case 3:
+                            #ifndef HELTEC_V3
+                                bme680.setTemperatureOversampling(BME680_OS_1X);
+                                bme680.setHumidityOversampling(BME680_OS_1X);
+                                bme680.setPressureOversampling(BME680_OS_1X);
+                                bme680.setIIRFilterSize(BME680_FILTER_SIZE_0);
+                                Serial.println("BMP680 Module init done!");
+                            #endif
+                            break;
                     }
                 }
             }            
@@ -198,16 +194,18 @@ namespace BME_Utils {
                 newPress    = (bmp280.readPressure() / 100.0F);
                 newHum      = 0;
                 break;
-            /*case 3: // BME680
-                bme680.performReading();
-                delay(50);
-                if (bme680.endReading()) {
-                    newTemp     = bme680.temperature;
-                    newPress    = (bme680.pressure / 100.0F);
-                    newHum      = bme680.humidity;
-                    newGas      = bme680.gas_resistance / 1000.0; // in Kilo ohms
-                }
-                break;*/
+            case 3: // BME680
+                #ifndef HELTEC_V3
+                    bme680.performReading();
+                    delay(50);
+                    if (bme680.endReading()) {
+                        newTemp     = bme680.temperature;
+                        newPress    = (bme680.pressure / 100.0F);
+                        newHum      = bme680.humidity;
+                        newGas      = bme680.gas_resistance / 1000.0; // in Kilo ohms
+                    }
+                #endif
+                break;
         }    
 
         if (isnan(newTemp) || isnan(newHum) || isnan(newPress)) {