Fix bug on pause
Merge recover