#178 simplified recovery