Fix for blank tables