Fix: Not using correct vars names