Improve seriously broken flush facility.