Stable basic recovery
some fix