diff --git a/powerwall.sh b/powerwall.sh
index 3ddab740..2e6445f3 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -556,7 +556,7 @@ CHECKPOWER(){
 			[[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.1f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 			BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
-			[ ${BATTA} -le 0 ] && BATTA_disp="${idsCL[Green]}${BATTA}'A - Charging" || BATTA_disp="${idsCL[LightRed]}${BATTA}'A - Discharging"
+			([ ${BATTA} -le 0 ] || [[ "${BATTA}" == *"-"* ]]) && BATTA_disp="${idsCL[Green]}${BATTA}'A - Charging" || BATTA_disp="${idsCL[LightRed]}${BATTA}'A - Discharging"
 		fi
 		
 		echo -e "${idsCL[LightCyan]}Inverter Input Volts     ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}'V"
@@ -604,7 +604,7 @@ CHECKPOWER(){
 		echo
 		
 		echo -e "${idsCL[LightCyan]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'V${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP}'V${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'V${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT_disp}'W${idsCL[Default]}"
 		echo