Possible fix for Flash issue

Change-Id: I6b12da194e23ab66e2578c2dff143ab665e9a034