Fixed problem with double table names