Fixed some bug in the variables

Change-Id: Iaae1008b831d8ad52cc57557fc886ee65d370264