Part 2 of the Flashlight bug fix

Credit to Bajee11

Change-Id: Ie9c8fbb333a059d9dd29b36339e55d963d8c7db9