Table persistance fix