Avoid extra context; fix