Improve flush, still doesn't work