Fix: var bugs