Table Widget - Persistance Fix