ADD: [lib] ensure scope is returned on #done