First try at preventing crash on some buggy post 2.0 tables