Better recovery mechanism