Restore context correctly
2 files changed