Fix: return the right variable