fix flush bug
Merge branch 'fix_test'