add missing root-context after cleanup