Fixed discarding, I think.