VarName generation issue fixed