fixed flash message
Merge branch 'origin/setFlash-patch'