better corruption handling