Fixed bug with tables
latest chngs