Fix breakage when I moved functions around