fix table/key issue