now enumerates variables correctly