Practice safe autoflush

For #954