Thanks @cookieroseta for pointing it out too. Fixing the bug fixed more than one issue, so that's great.