Fix another corner case related to table merging