Fix: Duplicate variables