Should have context handling working again.