Fix for Flashlight