:((((
Fix bugs with recovering