Properly handle recover stack in all cases, fixes #43