Battery draining issue fix

Published --