Try to fix bugs introduced when refactoring the table