Fix tables handling.