Fixed ContextExtender