fix for context override to work