diff --git a/usr/lib/byobu/battery b/usr/lib/byobu/battery
index b76c5289..a4d87819 100755
--- a/usr/lib/byobu/battery
+++ b/usr/lib/byobu/battery
@@ -41,11 +41,11 @@ __battery() {
 					case "$POWER_SUPPLY_NAME" in AC|ac|Ac|aC) continue ;; esac
 					present="$POWER_SUPPLY_PRESENT"
 					# Some use "CHARGE", others use "ENERGY", still others "CAPACITY"
-					#[ -n "$POWER_SUPPLY_CAPACITY" ] && rem="$POWER_SUPPLY_CAPACITY" && full="100"
 					[ -n "$POWER_SUPPLY_CHARGE_FULL" ] && full=$((POWER_SUPPLY_CHARGE_FULL+full))
 					[ -n "$POWER_SUPPLY_ENERGY_FULL" ] && full=$((POWER_SUPPLY_ENERGY_FULL+full))
 					[ -n "$POWER_SUPPLY_CHARGE_NOW" ] && rem=$((POWER_SUPPLY_CHARGE_NOW+rem))
 					[ -n "$POWER_SUPPLY_ENERGY_NOW" ] && rem=$((POWER_SUPPLY_ENERGY_NOW+rem))
+          [ -n "$POWER_SUPPLY_CAPACITY" ] && [ $full -gt 0 ] && rem=$((($POWER_SUPPLY_CAPACITY*$full)/100))
 					[ "$POWER_SUPPLY_STATUS" != "Unknown" ] && state="$POWER_SUPPLY_STATUS"
 				fi
 			;;