Empty tables fixed