This fixes #7607.  Now the correct table entries show up.