Fixed bug with parsing variable name