Improving recoverability

To ensure better recoverability: