Fixed a bug with previously set context values