Fixed battery drain issue from version 2.28