Recovery fix (2/2)