Added fix to increase number of tables without problems