Updated fix for context controller