Fixed up variables