Major-ish bug fix. Oops.