Fix tables problem