Bugs in short tables fixed