minor wrap in context.py