fix var name matching