New version with bugfix for table name