Really fix our var issue this time...