[3.9] Fix table detection