(GH-18) fixed issue that it was not possible to lookup variable and match it