Fix Bug with Table Name