Stop using the wrong tables. :/