Recovery tool edge case fix