* fixed issue with Context call