Fixed broken tables when empty tables