Battery drain fix