comply to the new Table.msg and fix potential crash