Moved deferred recover to useful position

fixes #58