Improve fault-resistance