Fixed location battery drain bug