Do not remove the table

Fix issue #482