Fixed use of bogus vars

Change-Id: I255c6283ee57e998d89319e4af27f6933e1b3420