Add flash fix by Bassel-Bakr #2