Fix bug in var names