Same fix on _flush