Fix context class: untested