autoflush corrected and extended