context fix and variable name change.