Handled the random table name problem