Table Model bug fixing. v2