Be more careful about adding active section to context.