diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
index 674ccb82..53ce9c32 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
@@ -375,9 +375,13 @@ public class BluetoothMiScale extends BluetoothCommunication {
             byte[] data = characteristic.getValue();
 
             int currentYear = Calendar.getInstance().get(Calendar.YEAR);
+            int currentMonth = Calendar.getInstance().get(Calendar.MONTH)+1;
+            int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
             int scaleYear = ((data[1] & 0xFF) << 8) | (data[0] & 0xFF);
+            int scaleMonth = (int) data[2];
+            int scaleDay = (int) data[3];
 
-            if (currentYear != scaleYear) {
+            if (currentYear != scaleYear || currentMonth != scaleMonth || currentDay != scaleDay) {
                 Log.d("BluetoothMiScale", "Current year and scale year is different");
                 invokeInitBluetoothCmd(gatt);
             } else {
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
index 542e7492..3b05fd05 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
@@ -421,8 +421,6 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
 
             if(convertView == null){
                 row = new LinearLayout(getContext());
-                row.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
-
                 convertView = row;
 
                 for (int i = 0; i< dataList.get(0).size(); i++) {