Fix variable mess.