Change variable lookup
Merge pull request #530 from owdqa/bug/fix_variable

Change variable lookup