Fix context run