fixed variable name parsing