Fix #224. Handle correctly recovery protocol
Merge pull request #243 from willyaranda/issue/224

Fix #224. Handle correctly recovery protocol