Last fix for BatteryService