last commit broke the restoration in standalone mode