Fix for table_name with database