diff --git a/hardware/ups/standard/rfc1628/mode/inputlines.pm b/hardware/ups/standard/rfc1628/mode/inputlines.pm
index 343c82d46..d33f7a7e7 100644
--- a/hardware/ups/standard/rfc1628/mode/inputlines.pm
+++ b/hardware/ups/standard/rfc1628/mode/inputlines.pm
@@ -127,7 +127,7 @@ sub build_values {
     }
     
     # Skip already done
-    if (defined($self->{instances_done}->{$instance})) {
+    if (!defined($instance) || defined($self->{instances_done}->{$instance})) {
         return 0;
     }
     
diff --git a/hardware/ups/standard/rfc1628/mode/outputlines.pm b/hardware/ups/standard/rfc1628/mode/outputlines.pm
index 1813ed69e..bc867b949 100644
--- a/hardware/ups/standard/rfc1628/mode/outputlines.pm
+++ b/hardware/ups/standard/rfc1628/mode/outputlines.pm
@@ -138,7 +138,7 @@ sub build_values {
     }
     
     # Skip already done
-    if (defined($self->{instances_done}->{$instance})) {
+    if (!defined($instance) || defined($self->{instances_done}->{$instance})) {
         return 0;
     }
     
@@ -207,7 +207,7 @@ sub run {
         my $extra_label = '';
         $extra_label = '_' . $instance_output if ($num > 1);
 
-        my $str_output = "Input Line '$instance_output' ";
+        my $str_output = "Output Line '$instance_output' ";
         my $str_append = '';
         foreach (keys %{$maps_counters}) {
             next if (!defined($self->{counters_value}->{$instance}->{$_}) || $self->{counters_value}->{$instance}->{$_} <= 0);