Fix tables check. v2.4 ready