Fixing the recovering

This should take care of the issues @patriknw brought up.