Fix context assignment nonsense