diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index f602a36..3bac2d1 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model
 
   comment  '! '
 
-  expect /^\s*--More--\s+.*$/ do |data, re|
+  expect /^([[:cntrl:]]...More:|\s*--More--\s+).*$/ do |data, re|
      send ' '
      data.sub re, ''
   end
@@ -60,7 +60,7 @@ class PowerConnect < Oxidized::Model
     skip_blocks = 0
     cfg.each_line do |line|
       # If this is a stackable switch we should skip this block of information
-      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true)
+      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i)
         skip_blocks = 1
         # Some switches have another empty line. This is identified by this line having a colon
         skip_blocks = 2 if line.match /:/