Fix a sneaky layout trying to avoid being part of the tables