fix on waith variable class

Change-Id: If9e0277f97d9e597c2b42c987dc9026d9084c92a