fixed added check for valueContext