fix flash when begin
Merge branch 'refactoring' into myrefactoring