Fix for double empty-table message