Fix: variable leakage