Pretty sure @AaronStrout had something to do w/ necessitating that last @WHERE bug fix