--- Bios.pm.orig	2014-06-16 11:23:09.901219209 -0700
+++ Bios.pm	2014-06-16 11:29:10.070804107 -0700
@@ -18,15 +18,15 @@
   $Type = `dmidecode -s chassis-type`;
   
   chomp($SystemModel);
-  $SystemModel =~ s/^#+\s+$//g;
+  $SystemModel =~ s/^#[^\n]*\n//msg;
   chomp($SystemManufacturer);
-  $SystemManufacturer =~ s/^#+\s+$//g;
+  $SystemManufacturer =~ s/^#[^\n]*\n//msg;
   chomp($SystemSerial);
-  $SystemSerial =~ s/^#+\s+$//g;
+  $SystemSerial =~ s/^#[^\n]*\n//msg;
   chomp($AssetTag);
-  $AssetTag =~ s/^#\s+$//g;
+  $AssetTag =~ s/^#[^\n]*\n//msg;
   chomp($Type);
-  $Type =~ s/^#\s+$//g;
+  $Type =~ s/^#[^\n]*\n//msg;
   
   #Motherboard DMI
   $MotherboardManufacturer = `dmidecode -s baseboard-manufacturer`;
@@ -34,11 +34,11 @@
   $MotherboardSerial = `dmidecode -s baseboard-serial-number`;
   
   chomp($MotherboardModel);
-  $MotherboardModel =~ s/^#+\s+$//g;
+  $MotherboardModel =~ s/^#[^\n]*\n//msg;
   chomp($MotherboardManufacturer);
-  $MotherboardManufacturer =~ s/^#+\s+$//g;
+  $MotherboardManufacturer =~ s/^#[^\n]*\n//msg;
   chomp($MotherboardSerial);
-  $MotherboardSerial =~ s/^#+\s+$//g;
+  $MotherboardSerial =~ s/^#[^\n]*\n//msg;
   
   #BIOS DMI
   $BiosManufacturer = `dmidecode -s bios-vendor`;
@@ -46,11 +46,11 @@
   $BiosDate = `dmidecode -s bios-release-date`;
   
   chomp($BiosManufacturer);
-  $BiosManufacturer =~ s/^#+\s+$//g;
+  $BiosManufacturer =~ s/^#[^\n]*\n//msg;
   chomp($BiosVersion);
-  $BiosVersion =~ s/^#+\s+$//g;
+  $BiosVersion =~ s/^#[^\n]*\n//msg;
   chomp($BiosDate);
-  $BiosDate =~ s/^#+\s+$//g;
+  $BiosDate =~ s/^#[^\n]*\n//msg;
 
 # Some bioses don't provide a serial number so I check for CPU ID (e.g: server from dedibox.fr)
   my @cpu;