jordan's context fix