Fix - Deal with empty tables