diff --git a/KAIBatteryStack.mm b/KAIBatteryStack.mm
index 0ed9eaa..7752975 100755
--- a/KAIBatteryStack.mm
+++ b/KAIBatteryStack.mm
@@ -117,11 +117,11 @@ long long lastPercentage;
 
 		} else {
             int height;
-            /*if([self.superview.subviews objectAtIndex:([self.superview.subviews count] - 1)] == self) {
+            if([self.superview.subviews objectAtIndex:([self.superview.subviews count] - 1)] == self) {
                 height = (self.number * (bannerHeight + spacing));
-            } else {*/
+            } else {
 		        height = (self.number * (bannerHeight + spacing)) - spacing;
-            //}
+            }
 			self.heightConstraint.constant = height;
 
 			UIStackView *s = (UIStackView *)(self.superview);
diff --git a/Kai.xm b/Kai.xm
index 429d455..224b9a3 100755
--- a/Kai.xm
+++ b/Kai.xm
@@ -61,6 +61,13 @@
 		dispatch_async(dispatch_get_main_queue(), ^{
 
 		[[KAIBatteryStack sharedInstance] updateBattery];
+		if([KAIBatteryStack sharedInstance].number == 0) {
+			[[KAIBatteryStack sharedInstance] removeFromSuperview];
+			[[self stackView] removeArrangedSubview:[KAIBatteryStack sharedInstance]];
+		} else if(![[self stackView].subviews containsObject:[KAIBatteryStack sharedInstance]]) {
+			[[self stackView] addSubview:[KAIBatteryStack sharedInstance]];
+			[[self stackView] addArrangedSubview:[KAIBatteryStack sharedInstance]];
+		}
 		if([KAISelf.superview respondsToSelector:@selector(fixComplicationsViewFrame)]) {
 		[KAISelf.superview performSelector:@selector(fixComplicationsViewFrame) withObject:KAISelf.superview afterDelay:0.35];
 		//[KAISelf.superview performSelector:@selector(fixComplicationsViewFrame) withObject:KAISelf.superview afterDelay:0.5];